*** empty log message ***

diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el
index 3c6681d3fb7ca324f29132972e7d0d85d816b921..3280861efdf263b330d0c7cde718e39d2e1f21f7 100644 (file)
--- a/lisp/ediff-merg.el
+++ b/lisp/ediff-merg.el
@@ -90,6 +90,7 @@ skiped over. Nil means show all regions.")
   ;; by Stig@hackvan.com
   (normal-mode t)
   (remove-hook 'local-write-file-hooks 'ediff-set-merge-mode))
+
        
 ;; Go over all diffs starting with DIFF-NUM and copy regions into buffer C
 ;; according to the state of the difference.
@@ -113,7 +114,6 @@ skiped over. Nil means show all regions.")
                   ediff-number-of-differences))
             
       (setq state-of-merge (ediff-get-state-of-merge n))
-      (setq do-not-copy (string= state-of-merge default-state-of-merge))
 
       (if remerging
          (let ((reg-A (ediff-get-region-contents n 'A ediff-control-buffer))